workspaceAnimation: Assign movingWindow before creating window actors

The BaseWorkspaceGroup constructor calls _createWindows(), which uses
_shouldShowWindow() to determine which actors to create for the
animation.

In WorkspaceGroup _shouldShowWindow() this depends on a comparison with
this._movingWindow, which however only gets set after the
BaseWorkspaceGroup constructor has been called.

This was causing the moving window to no longer stick to the screen
when moved between workspaces.

Fixes: 96be47933 ("workspaceAnimation: Split out BaseWorkspaceGroup")
Closes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/8992
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/4092>

diff --git a/js/ui/workspaceAnimation.js b/js/ui/workspaceAnimation.js
index 5bb2a10a76bbe2a3c42ac1d9bd8c5acd10522689..db4050a2a18fa8b6947ed9a3b05470876fb099c1 100644 (file)
--- a/js/ui/workspaceAnimation.js
+++ b/js/ui/workspaceAnimation.js
@@ -16,7 +16,7 @@ export const WORKSPACE_SPACING = 100;
 
 export const BaseWorkspaceGroup = GObject.registerClass(
 class BaseWorkspaceGroup extends Clutter.Actor {
-    constructor(workspace, monitor) {
+    constructor(workspace, monitor, movingWindow) {
         super({
             width: monitor.width,
             height: monitor.height,
@@ -25,6 +25,7 @@ class BaseWorkspaceGroup extends Clutter.Actor {
 
         this._workspace = workspace;
         this._monitor = monitor;
+        this._movingWindow = movingWindow;
         this._windowRecords = [];
 
         this._createBackground();
@@ -94,9 +95,7 @@ class BaseWorkspaceGroup extends Clutter.Actor {
 export const WorkspaceGroup = GObject.registerClass(
 class WorkspaceGroup extends BaseWorkspaceGroup {
     constructor(workspace, monitor, movingWindow) {
-        super(workspace, monitor);
-
-        this._movingWindow = movingWindow;
+        super(workspace, monitor, movingWindow);
 
         global.display.connectObject('restacked',
             () => this._syncStacking(), this);
@@ -150,6 +149,10 @@ class WorkspaceGroup extends BaseWorkspaceGroup {
 
 export const WorkspaceBackground = GObject.registerClass(
 class WorkspaceBackground extends BaseWorkspaceGroup {
+    constructor(workspace, monitor) {
+        super(workspace, monitor, null);
+    }
+
     _shouldShowWindow(window) {
         return this._isDesktopWindow(window) &&
             this._windowIsOnThisMonitor(window);